From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 9 Jan 2010 11:00:21 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~32
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6eca625b774a4bdc782e8b878c8cf05663742101;p=emacs.git

Merge from mainline.
---

6eca625b774a4bdc782e8b878c8cf05663742101